diff --git a/db845c/device.mk b/db845c/device.mk
index b37e06f..23299ad 100644
--- a/db845c/device.mk
+++ b/db845c/device.mk
@@ -32,10 +32,9 @@
 # Build generic Audio HAL
 PRODUCT_PACKAGES := audio.primary.db845c
 
+# Build and install Qcom userspace tools to talk to dsp and modem
 PRODUCT_PACKAGES += \
     pd-mapper \
-    qrtr-ns \
-    qrtr-cfg \
     qrtr-lookup \
     rmtfs \
     tqftpserv
diff --git a/qcom/init.qcom.rc b/qcom/init.qcom.rc
index 303fc9a..6325127 100644
--- a/qcom/init.qcom.rc
+++ b/qcom/init.qcom.rc
@@ -1,10 +1,3 @@
-service qrtr-ns /vendor/bin/qrtr-ns -f 1
-    class core
-    user root
-    group system
-    disabled
-    oneshot
-
 service pd_mapper /vendor/bin/pd-mapper
     class core
     user root
@@ -26,11 +19,6 @@
     disabled
     oneshot
 
-on early-init
-    exec - root -- /vendor/bin/qrtr-cfg 1
-    start qrtr-ns
-    start pd_mapper
-
 on post-fs-data
     mkdir /data/vendor
     mkdir /data/vendor/tmp
@@ -39,5 +27,6 @@
     mkdir /data/vendor/readonly/firmware
     mkdir /data/vendor/readonly/firmware/image
     write /sys/class/firmware/timeout 1
+    start pd_mapper
     start tqftpserv
     start rmtfs
diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts
index 247e1ab..532b1c9 100644
--- a/sepolicy/file_contexts
+++ b/sepolicy/file_contexts
@@ -33,8 +33,6 @@
 
 /vendor/bin/hw/android\.hardware\.gatekeeper@1\.0-service\.software			u:object_r:hal_gatekeeper_default_exec:s0
 /vendor/bin/pd-mapper									u:object_r:pd_mapper_exec:s0
-/vendor/bin/qrtr-cfg									u:object_r:qrtr_exec:s0
-/vendor/bin/qrtr-ns									u:object_r:qrtr_exec:s0
 /vendor/bin/rmtfs									u:object_r:rmtfs_exec:s0
 /vendor/bin/tqftpserv									u:object_r:tqftpserv_exec:s0
 
@@ -44,4 +42,3 @@
 /vendor/lib(64)?/libdrm_freedreno\.so							u:object_r:same_process_hal_file:s0
 /vendor/lib(64)?/libgbm\.so								u:object_r:same_process_hal_file:s0
 /vendor/lib(64)?/libglapi\.so								u:object_r:same_process_hal_file:s0
-/vendor/lib(64)?/libqrtr\.so								u:object_r:same_process_hal_file:s0
diff --git a/sepolicy/qrtr.te b/sepolicy/qrtr.te
deleted file mode 100644
index 8344398..0000000
--- a/sepolicy/qrtr.te
+++ /dev/null
@@ -1,8 +0,0 @@
-type qrtr, domain;
-type qrtr_exec, exec_type, vendor_file_type, file_type;
-init_daemon_domain(qrtr)
-
-allow qrtr self:capability net_admin;
-allow qrtr self:capability sys_admin;
-allow qrtr self:qipcrtr_socket create_socket_perms_no_ioctl;
-allow qrtr self:netlink_route_socket { create nlmsg_write read write };